Use GPSBabel's abstraction for word size since the one from jeeps is dumb.

diff --git a/gpsbabel/jeeps/gpsport.h b/gpsbabel/jeeps/gpsport.h
index 040efd2e76a3fe02d9d45caf1f31a64bb764e375..c640c42a72695e810c4ad5190d9ae66976e75bad 100644 (file)
--- a/gpsbabel/jeeps/gpsport.h
+++ b/gpsbabel/jeeps/gpsport.h
@@ -2,15 +2,14 @@
  *  For portability any '32' type must be 32 bits
  *                  and '16' type must be 16 bits
  */
-typedef unsigned char UC;
-typedef short int16;
-typedef unsigned short uint16;
-typedef uint16 US;
 
-#if defined(__alpha)
-typedef int int32;
-typedef unsigned int uint32;
-#else
-typedef long int32;
-typedef unsigned long uint32;
-#endif
+/* Since GPSBabel already has an integer size abstraction layer and
+ * defs.h includes gbtypes.h before this file, just use that.
+ */
+
+typedef unsigned char UC;
+typedef uint16        US;
+typedef gbuint16      uint16;
+typedef gbint16       int16;
+typedef gbuint32      uint32;
+typedef gbint32       int32;